新增工卡信息功能

src/api/mes/workCard/index.js

@@ -0,0 +1,54 @@
+import request from "@/utils/request";
+
+// 查询工作卡分页
+export function getWordCardList(query) {
+    return request({
+        url: '/iscs/card/getIsJobCardPage',
+        method: 'get',
+        params: query
+    })
+}
+
+// 工卡详细信息
+export function workCardInfo(cardId) {
+    return request({
+        url: '/iscs/card/selectIsJobCardById?cardId=' + cardId,
+        method: 'get'
+    })
+}
+
+
+// 新增工卡
+export function addWorkCard(data) {
+    return request({
+        url: '/iscs/card/insertIsJobCard',
+        method: 'post',
+        data: data
+    })
+}
+
+// 修改工卡信息
+export function updateWorkCard(data) {
+    return request({
+        url: '/iscs/card/updateIsJobCard',
+        method: 'post',
+        data: data
+    })
+}
+
+// 删除工卡信息
+export function delWorkCard(cardId) {
+    return request({
+        url: '/iscs/card/deleteIsJobCardByCardIds?cardIds=' + cardId,
+        method: 'post'
+    })
+}
+
+// 人员列表
+export function getUserList(query) {
+    return request({
+        url: '/system/user/list',
+        method: 'get',
+        params: query
+    })
+}

src/views/mes/hw/workCard/index.vue

@@ -0,0 +1,492 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      size="small"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <el-row>
+        <el-form-item label="工卡编码" prop="cardCode">
+          <el-input
+            v-model="queryParams.cardCode"
+            placeholder="请输入工卡编码"
+            clearable
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="工卡类型" prop="cardType">
+          <el-select
+            v-model="queryParams.cardType"
+            placeholder="请选择工卡类型"
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.card_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="用户名称" prop="userName">
+          <el-select
+            v-model="queryParams.userName"
+            placeholder="请选择工卡用户"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in this.userList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item style="margin-left: 20px">
+          <el-button
+            v-no-more-click
+            type="primary"
+            icon="el-icon-search"
+            size="mini"
+            @click="handleQuery"
+            >搜索
+          </el-button>
+          <el-button
+            v-no-more-click
+            icon="el-icon-refresh"
+            size="mini"
+            @click="resetQuery"
+            >重置
+          </el-button>
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          v-no-more-click
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['mes:hw:information:add']"
+          >新增
+        </el-button>
+      </el-col>
+
+      <el-col :span="1.5">
+        <el-button
+          v-no-more-click
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['mes:hw:information:batchremove']"
+          >批量删除
+        </el-button>
+      </el-col>
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="repairList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column
+        label="工卡编码"
+        width="150px"
+        align="center"
+        prop="cardCode"
+      />
+      <el-table-column
+        label="工卡类型"
+        width="180px"
+        align="center"
+        prop="cardType"
+      >
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.card_type"
+            :value="scope.row.cardType"
+          />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="工卡NFC"
+        width="180px"
+        align="center"
+        prop="cardNfc"
+        :show-overflow-tooltip="true"
+      />
+      <el-table-column label="用户名称" align="center" prop="userName" />
+
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        fixed="right"
+      >
+        <template slot-scope="scope">
+          <el-button
+            v-no-more-click
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['mes:hw:information:edit']"
+            >编辑
+          </el-button>
+          <el-button
+            v-no-more-click
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['mes:hw:information:remove']"
+            >删除
+          </el-button>
+          <!--          <el-button v-no-more-click size="mini" type="text">预览</el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.current"
+      :limit.sync="queryParams.size"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改设备维修单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="450px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="用户名称" prop="userName">
+          <el-select
+            v-model="form.userName"
+            placeholder="请选择工卡用户"
+            clearable
+            style="width: 100%"
+          >
+            <el-option
+              v-for="dict in this.userList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-row>
+          <el-col :span="15">
+            <el-form-item label="工卡编码" prop="cardCode">
+              <el-input
+                v-model="form.cardCode"
+                placeholder="请输入钥匙编码"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label-width="80">
+              <el-switch
+                v-model="autoGenFlag"
+                active-color="#13ce66"
+                active-text="自动生成"
+                @change="handleAutoGenChange(autoGenFlag)"
+              >
+              </el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="工卡NFC" prop="cardNfc">
+          <el-input
+            v-model="form.cardNfc"
+            placeholder="请输入工卡Nfc"
+            maxlength="16"
+          />
+        </el-form-item>
+        <el-form-item label="工卡类型" prop="cardType">
+          <el-select
+            v-model="form.cardType"
+            placeholder="请选择工卡类型"
+            clearable
+          >
+            <el-option
+              v-for="dict in dict.type.card_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-no-more-click type="primary" @click="submitForm"
+          >确 定</el-button
+        >
+        <el-button v-no-more-click @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  getWordCardList,
+  getUserList,
+  addWorkCard,
+  workCardInfo,
+  updateWorkCard,
+  delWorkCard,
+} from "@/api/mes/workCard/index";
+import { listHardware } from "@/api/mes/hw/hardwareinfo";
+import { genCode } from "@/api/system/autocode/rule";
+
+export default {
+  name: "lock",
+  dicts: ["card_type"],
+  data() {
+    return {
+      autoGenFlag: false,
+      optType: undefined,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      codes: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 设备维修单表格数据
+      repairList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      createTime: "",
+      queryParams: {
+        current: 1,
+        size: 10,
+        cardCode: null,
+        cardType: null,
+        userName: null,
+      },
+      hardWareList: [],
+      queryhwParams: {
+        current: 1,
+        size: -1,
+      },
+      userList: [],
+      // 表单参数
+      form: {
+        hardwareId: null,
+      },
+      // 表单校验
+      rules: {
+        cardCode: [
+          { required: true, message: "工卡编码不能为空", trigger: "blur" },
+        ],
+        userName: [
+          { required: true, message: "用户名称不能为空", trigger: "blur" },
+        ],
+        cardNfc: [
+          { required: true, message: "工卡NFC不能为空", trigger: "blur" },
+        ],
+        cardType: [
+          { required: true, message: "工卡类型不能为空", trigger: "blur" },
+        ],
+      },
+      // 新增状态
+      EditId: 0, //修改判断
+      machinerytypeOptions: [], //锁具类型
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    //自动生成编码
+    handleAutoGenChange(autoGenFlag) {
+      if (autoGenFlag) {
+        genCode("CARD_CODE").then((response) => {
+          this.form.cardCode = response;
+          console.log(response, this.form.cardCode, "cardCode");
+        });
+      } else {
+        this.form.cardCode = null;
+      }
+    },
+    /** 查询设备维修单列表 */
+
+    getList() {
+      this.loading = true;
+
+      // 工卡数据
+      getWordCardList(this.queryParams).then((response) => {
+        this.repairList = response.data.records;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+
+      // 人员数据
+      const data = {
+        current: 1,
+        size: -1,
+      };
+      getUserList(data).then((respone) => {
+        // console.log(respone, "人员数据");
+        this.userList = respone.rows.map((item) => {
+          return {
+            value: item.userName,
+            label: item.userName,
+          };
+        });
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        cardName: null,
+        cardCode: null,
+        cardNfc: null,
+        remark: null,
+      };
+
+      this.autoGenFlag = false;
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.current = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams.cardCode = "";
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.cardId);
+      this.codes = selection.map((item) => item.cardCode);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.EditId = null;
+      this.title = "新增钥匙信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.EditId = row.cardId || this.ids;
+      workCardInfo(this.EditId).then((response) => {
+        console.log(response, "response");
+        this.form = response.data;
+        this.open = true;
+        this.title = "编辑钥匙信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.EditId != null) {
+            updateWorkCard(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            console.log(this.form, "form");
+            addWorkCard(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.EditId = null;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const repairIds = row.cardId || this.ids;
+      const repairCodes = row.cardCode || this.codes;
+      this.$modal
+        .confirm('是否确认删除编码为"' + repairCodes + '"的数据项？')
+        .then(function () {
+          return delWorkCard(repairIds);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+.imgstatus {
+  position: relative;
+  top: 1px;
+  left: 0px;
+}
+
+/deep/ .el-radio__inner {
+  border-radius: 2px;
+}
+
+/deep/ .el-radio__input.is-checked .el-radio__inner::after {
+  content: "";
+  width: 8px;
+  height: 3px;
+  border: 1px solid white;
+  border-top: transparent;
+  border-right: transparent;
+  text-align: center;
+  display: block;
+  position: absolute;
+  top: 3px;
+  left: 2px;
+  transform: rotate(-45deg);
+  border-radius: 0pc;
+  background: none;
+}
+</style>

src/views/mes/job/jobplay/index.vue

@@ -311,8 +311,13 @@ export default {
   },
   created() {
     this.getList();
+    this.getWorkareaList();
+  },
+  mounted() {
+    setInterval(() => {
+      this.getList();
+    }, 5000);
   },
-
   methods: {
     // 格式化日期查询数据
     formatDate(date) {
@@ -327,18 +332,15 @@ export default {
     },
     /** 查询班组列表 */
     getList() {
-      this.loading = true;
-      // 格式化日期并更新queryParams
-      if (Array.isArray(this.createTime) && this.createTime.length === 2) {
-        this.queryParams.startTime = this.formatDate(this.createTime[0]);
-        this.queryParams.endTime = this.formatDate(this.createTime[1]);
-      }
+      // this.loading = true;
       listJobPlayTicket(this.queryParams).then((response) => {
         console.log(response, "response--作业票列表");
         this.jobList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
+    },
+    getWorkareaList() {
       const data = {
         current: 1,
         size: -1,

src/views/mes/job/jobplay/jobPlayDetail.vue

@@ -5,8 +5,10 @@
         <div slot="header" class="clearfix">
           <span style="font-weight: bolder">作业状态</span>
         </div>
-        <el-table :data="jobTicket" :header-cell-style="{'text-align':'center'}"
-                  :cell-style="{'text-align':'center'}"
+        <el-table
+          :data="jobTicket"
+          :header-cell-style="{ 'text-align': 'center' }"
+          :cell-style="{ 'text-align': 'center' }"
         >
           <el-table-column label="作业编号" prop="ticketCode">
           </el-table-column>
@@ -27,77 +29,85 @@
         </el-table>
       </el-card>
     </el-row>
-    <el-row style="margin-top:10px;height:620px;overflow-y:auto">
-      <el-col :span="6" style="height:1000px">
-        <el-card class="box-card1" >
+    <el-row style="margin-top: 10px; height: 620px; overflow-y: auto">
+      <el-col :span="6" style="height: 1000px">
+        <el-card class="box-card1">
           <div slot="header" class="clearfix">
             <span style="font-weight: bolder">人员状态</span>
           </div>
           <el-table :data="lockUserList">
-            <el-table-column label="上锁人" prop="userName">
-            </el-table-column>
+            <el-table-column label="上锁人" prop="userName"> </el-table-column>
             <el-table-column label="状态" align="center" prop="jobStatus">
               <template slot-scope="scope">
                 <div
                   class="box"
                   style="
-                width: 30px;
-                height: 30px;
-                border: 1px solid black;
-                background-color: white;
-                margin: 0 auto;
-              "
+                    width: 30px;
+                    height: 30px;
+                    border: 1px solid black;
+                    background-color: white;
+                    margin: 0 auto;
+                  "
                 >
                   <span
-                    v-if="scope.row.jobStatus==0||scope.row.jobStatus==1||scope.row.jobStatus==2||scope.row.jobStatus==3"
+                    v-if="
+                      scope.row.jobStatus == 0 ||
+                      scope.row.jobStatus == 1 ||
+                      scope.row.jobStatus == 2 ||
+                      scope.row.jobStatus == 3
+                    "
                   ></span>
                   <!-- 显示错号 -->
                   <span
-                    v-else-if="scope.row.jobStatus==4"
+                    v-else-if="scope.row.jobStatus == 4"
                     style="font-size: 20px; line-height: 30px"
-                  >🔒</span
+                    >🔒</span
                   >
                   <!-- 显示对号 -->
                   <span
-                    v-else-if="scope.row.jobStatus==5"
+                    v-else-if="scope.row.jobStatus == 5"
                     style="font-size: 20px; line-height: 30px"
-                  >✓</span
+                    >✓</span
                   >
                 </div>
               </template>
             </el-table-column>
           </el-table>
         </el-card>
-        <el-card>
+        <el-card class="box-cardgsr">
           <el-table :data="colockUserList">
-            <el-table-column label="共锁人" prop="userName">
-            </el-table-column>
+            <el-table-column label="共锁人" prop="userName"> </el-table-column>
             <el-table-column label="状态" align="center" prop="jobStatus">
               <template slot-scope="scope">
                 <div
                   class="box"
                   style="
-                width: 30px;
-                height: 30px;
-                border: 1px solid black;
-                background-color: white;
-                margin: 0 auto;
-              "
+                    width: 30px;
+                    height: 30px;
+                    border: 1px solid black;
+                    background-color: white;
+                    margin: 0 auto;
+                  "
                 >
                   <span
-                    v-if="scope.row.jobStatus==0||scope.row.jobStatus==1||scope.row.jobStatus==2||scope.row.jobStatus==3"
+                    v-if="
+                      scope.row.jobStatus == 0 ||
+                      scope.row.jobStatus == 1 ||
+                      scope.row.jobStatus == 2 ||
+                      scope.row.jobStatus == 3
+                    "
                   ></span>
                   <!-- 显示错号 -->
                   <span
-                    v-else-if="scope.row.jobStatus==4"
+                    v-else-if="scope.row.jobStatus == 4"
                     style="font-size: 20px; line-height: 30px"
-                  >🔒</span
+                    >🔒</span
                   >
                   <!-- 显示对号 -->
                   <span
-                    v-else-if="scope.row.jobStatus==5"
+                    v-else-if="scope.row.jobStatus == 5"
                     style="font-size: 20px; line-height: 30px"
-                  >✓</span
+                    >✓</span
                   >
                 </div>
               </template>
@@ -106,7 +116,7 @@
         </el-card>
       </el-col>
       <el-col :span="6">
-        <el-card class="box-card2" >
+        <el-card class="box-card2">
           <div slot="header" class="clearfix">
             <span style="font-weight: bolder">隔离点状态</span>
           </div>
@@ -119,33 +129,32 @@
                 <div
                   class="box"
                   style="
-                width: 30px;
-                height: 30px;
-                border: 1px solid black;
-                background-color: white;
-                margin: 0 auto;
-              "
+                    width: 30px;
+                    height: 30px;
+                    border: 1px solid black;
+                    background-color: white;
+                    margin: 0 auto;
+                  "
                 >
-                  <span v-if="scope.row.pointStatus==0" style=""></span>
+                  <span v-if="scope.row.pointStatus == 0" style=""></span>
                   <!-- 显示错号 -->
                   <span
-                    v-else-if="scope.row.pointStatus==1"
-                    style="font-size: 20px; line-height: 30px;"
-                  >🔒</span
+                    v-else-if="scope.row.pointStatus == 1"
+                    style="font-size: 20px; line-height: 30px"
+                    >🔒</span
                   >
                   <!-- 显示对号 -->
                   <span
-                    v-else-if="scope.row.pointStatus==2"
-                    style="font-size: 20px; line-height: 30px;"
-                  >✓</span
+                    v-else-if="scope.row.pointStatus == 2"
+                    style="font-size: 20px; line-height: 30px"
+                    >✓</span
                   >
                 </div>
               </template>
             </el-table-column>
             <el-table-column label="挂锁名称" prop="lockName">
             </el-table-column>
-            <el-table-column label="锁具" prop="locksetName">
-            </el-table-column>
+            <el-table-column label="锁具" prop="locksetName"> </el-table-column>
           </el-table>
         </el-card>
       </el-col>
@@ -154,45 +163,48 @@
 </template>
 
 <script>
-import { getJobPlayTicketInfo } from '@/api/mes/jobplay/jobplay'
+import { getJobPlayTicketInfo } from "@/api/mes/jobplay/jobplay";
 
 export default {
-  name: 'jobPlayDetail',
-  dicts: ['ticket_type', 'ticket_status'],
+  name: "jobPlayDetail",
+  dicts: ["ticket_type", "ticket_status"],
   data() {
     return {
       jobTicket: [],
       lockUserList: [],
       colockUserList: [],
-      ticketPointsList: []
-
-    }
+      ticketPointsList: [],
+    };
   },
   mounted() {
-    this.getJobPlayInfo()
+    this.getJobPlayInfo();
   },
+  // mounted() {
+  //   setInterval(() => {
+  //     this.getJobPlayInfo();
+  //   }, 5000);
+  // },
   methods: {
     getJobPlayInfo() {
-      const ticketId = this.$route.query.ticketId
-      getJobPlayTicketInfo(ticketId).then(res => {
-        console.log(res, '作业执行详细信息')
-        this.jobTicket = [res.data.jobTicket].map(item => ({
+      const ticketId = this.$route.query.ticketId;
+      getJobPlayTicketInfo(ticketId).then((res) => {
+        console.log(res, "作业执行详细信息");
+        this.jobTicket = [res.data.jobTicket].map((item) => ({
           ...item,
           lockKeyName: res.data.lockKeyName,
-          colockKeyName: res.data.colockKeyName
-        }))
-        this.lockUserList = res.data.lockUserList
-        this.colockUserList = res.data.colockUserList
-        this.ticketPointsList = res.data.ticketPointsList
-      })
-    }
-  }
-}
+          colockKeyName: res.data.colockKeyName,
+        }));
+        this.lockUserList = res.data.lockUserList;
+        this.colockUserList = res.data.colockUserList;
+        this.ticketPointsList = res.data.ticketPointsList;
+      });
+    },
+  },
+};
 </script>
 
 
 <style scoped lang="scss">
-
 .text {
   font-size: 14px;
 }
@@ -208,7 +220,7 @@ export default {
 }
 
 .clearfix:after {
-  clear: both
+  clear: both;
 }
 
 .box-card {
@@ -220,7 +232,11 @@ export default {
   width: 400px;
   margin: 15px;
 }
-
+.box-cardgsr {
+  width: 400px;
+  height: auto;
+  margin: 15px;
+}
 .box-card2 {
   width: 780px;
   margin: 15px;