修复作业票与作业执行详情的websocket调用以及10月4日会议提出的部分需求变更

src/api/mes/Keys/Keys.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询锁具-列表
+// 查询锁具机构-列表
 export function listKeyAPI(query) {
   return request({
     url: '/iscs/key/getIsKeyPage',
@@ -10,7 +10,7 @@ export function listKeyAPI(query) {
   })
 }
 
-// 获取锁具详细信息
+// 获取锁具机构详细信息
 export function getKeyInfoAPI(repairId) {
   return request({
     url: '/iscs/key/selectIsKeyById?keyId=' + repairId,
@@ -18,7 +18,7 @@ export function getKeyInfoAPI(repairId) {
   })
 }
 
-//新增锁具
+//新增锁具机构
 export function addKeyAPI(query) {
   return request({
     url: '/iscs/key/insertIsKey',
@@ -27,7 +27,7 @@ export function addKeyAPI(query) {
   })
 }
 
-// 修改锁具信息
+// 修改锁具机构信息
 export function updateKeyAPI(data) {
   return request({
     url: '/iscs/key/updateIsKey',
@@ -36,7 +36,7 @@ export function updateKeyAPI(data) {
   })
 }
 
-// 删除锁具信息
+// 删除锁具机构信息
 export function delKeyAPI(repairId) {
   return request({
     url: '/iscs/key/deleteIsKeyByKeyIds?keyIds='+ repairId,

src/api/mes/Lock/Lock.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询锁具-列表
+// 查询锁具机构-列表
 export function listLockAPI(query) {
   return request({
     url: '/iscs/lockset/getIsLocksetPage',
@@ -10,7 +10,7 @@ export function listLockAPI(query) {
   })
 }
 
-// 获取锁具详细信息
+// 获取锁具机构详细信息
 export function getLockInfoAPI(repairId) {
   return request({
     url: '/iscs/lockset/selectIsLocksetById?locksetId=' + repairId,
@@ -18,7 +18,7 @@ export function getLockInfoAPI(repairId) {
   })
 }
 
-//新增锁具
+//新增锁具机构
 export function addLockAPI(query) {
   return request({
     url: '/iscs/lockset/insertIsLockset',
@@ -27,7 +27,7 @@ export function addLockAPI(query) {
   })
 }
 
-// 修改锁具信息
+// 修改锁具机构信息
 export function updateLockAPI(data) {
   return request({
     url: '/iscs/lockset/updateIsLockset',
@@ -36,7 +36,7 @@ export function updateLockAPI(data) {
   })
 }
 
-// 删除锁具信息
+// 删除锁具机构信息
 export function delLockAPI(repairId) {
   return request({
     url: '/iscs/lockset/deleteIsLocksetByLocksetIds?locksetIds='+ repairId,

src/api/mes/locktype/locktype.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request'
 
 
-// 查询锁具-列表
+// 查询锁具机构-列表
 export function listLockType(query) {
   return request({
     url: '/iscs/type/getIsLocksetTypePage',
@@ -10,7 +10,7 @@ export function listLockType(query) {
   })
 }
 
-// 获取锁具详细信息
+// 获取锁具机构详细信息
 export function getLockTypeInfo(repairId) {
   return request({
     url: '/iscs/type/selectIsLocksetTypeById?locksetTypeId=' + repairId,
@@ -18,7 +18,7 @@ export function getLockTypeInfo(repairId) {
   })
 }
 
-//新增锁具
+//新增锁具机构
 export function addLockType(query) {
   return request({
     url: '/iscs/type/insertIsLocksetType',
@@ -27,7 +27,7 @@ export function addLockType(query) {
   })
 }
 
-// 修改锁具信息
+// 修改锁具机构信息
 export function updateLockType(data) {
   return request({
     url: '/iscs/type/updateIsLocksetType',
@@ -36,7 +36,7 @@ export function updateLockType(data) {
   })
 }
 
-// 删除锁具信息
+// 删除锁具机构信息
 export function delLockType(repairId) {
   return request({
     url: '/iscs/type/deleteIsLocksetTypeByLocksetTypeIds?locksetTypeIds='+ repairId,

src/store/modules/user.js

@@ -50,6 +50,8 @@ const user = {
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
+          // console.log(res,'打印用户信息')
+          localStorage.setItem('userId', res.user.userId)
           const user = res.user
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组

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

@@ -343,7 +343,7 @@ export default {
       // 新增状态
 
       EditId: 0, //修改判断
-      machinerytypeOptions: [], //锁具类型
+      machinerytypeOptions: [], //锁具机构类型
     };
   },
   created() {
@@ -380,7 +380,7 @@ export default {
     getList() {
       this.loading = true;
 
-      // 锁具数据
+      // 锁具机构数据
       listKeyAPI(this.queryParams).then((response) => {
         this.repairList = response.data.records;
         this.total = response.data.total;

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

@@ -9,31 +9,31 @@
       label-width="100px"
     >
       <el-row>
-        <el-form-item label="锁具编码" prop="locksetCode">
+        <el-form-item label="锁具机构编码" prop="locksetCode">
           <el-input
             v-model="queryParams.locksetCode"
-            placeholder="请输入锁具编码"
+            placeholder="请输入锁具机构编码"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="锁具名称" prop="locksetName">
+        <el-form-item label="锁具机构名称" prop="locksetName">
           <el-input
             v-model="queryParams.locksetName"
-            placeholder="请输入锁具名称"
+            placeholder="请输入锁具机构名称"
             clearable
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
 
-        <el-form-item label="锁具类型" prop="locksetTypeName">
+        <el-form-item label="锁具机构类型" prop="locksetTypeName">
           <treeselect
             style="width: 218px"
             v-model="queryParams.locksetTypeId"
             :options="locksetTypeOption"
             :normalizer="normalizer"
-            placeholder="选择锁具类型"
+            placeholder="选择锁具机构类型"
           />
         </el-form-item>
 
@@ -90,23 +90,23 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
-        label="锁具编码"
+        label="锁具机构编码"
         width="150px"
         align="center"
         prop="locksetCode"
       />
       <el-table-column
-        label="锁具名称"
+        label="锁具机构名称"
         width="180px"
         align="center"
         prop="locksetName"
         :show-overflow-tooltip="true"
       />
-      <el-table-column label="锁具类型" align="center" prop="locksetTypeName" />
-      <el-table-column label="锁具NFC" align="center" prop="locksetNfc" />
-      <el-table-column label="锁具RFID" align="center" prop="locksetRfid" />
+      <el-table-column label="锁具机构类型" align="center" prop="locksetTypeName" />
+      <el-table-column label="锁具机构NFC" align="center" prop="locksetNfc" />
+      <el-table-column label="锁具机构RFID" align="center" prop="locksetRfid" />
       <el-table-column label="物资名称" align="center" prop="materialsName" />
-      <el-table-column label="锁具型号" align="center" prop="locksetSpec" />
+      <el-table-column label="锁具机构型号" align="center" prop="locksetSpec" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -157,20 +157,20 @@
     <!-- 添加或修改设备维修单对话框 -->
     <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="locksetTypeId">
+        <el-form-item label="锁具机构类型" prop="locksetTypeId">
           <treeselect
             v-model="form.locksetTypeId"
             :options="locksetTypeOption"
             :normalizer="normalizer"
-            placeholder="选择锁具类型"
+            placeholder="选择锁具机构类型"
           />
         </el-form-item>
         <el-row>
           <el-col :span="15">
-            <el-form-item label="锁具编码" prop="locksetCode">
+            <el-form-item label="锁具机构编码" prop="locksetCode">
               <el-input
                 v-model="form.locksetCode"
-                placeholder="请输入锁具编码"
+                placeholder="请输入锁具机构编码"
                 style="width: 100%"
               />
             </el-form-item>
@@ -187,14 +187,14 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-form-item label="锁具名称" prop="locksetName">
-          <el-input v-model="form.locksetName" placeholder="请输入锁具名称" />
+        <el-form-item label="锁具机构名称" prop="locksetName">
+          <el-input v-model="form.locksetName" placeholder="请输入锁具机构名称" />
         </el-form-item>
-        <el-form-item label="锁具NFC" prop="locksetNfc">
-          <el-input v-model="form.locksetNfc" placeholder="请输入锁具Nfc" maxlength="16"/>
+        <el-form-item label="锁具机构NFC" prop="locksetNfc">
+          <el-input v-model="form.locksetNfc" placeholder="请输入锁具机构Nfc" maxlength="16"/>
         </el-form-item>
-        <el-form-item label="锁具RFID" prop="locksetRfid" >
-          <el-input v-model="form.locksetRfid" placeholder="请输入锁具RFID(纯数字)" maxlength="128"  oninput="value=value.replace(/[^\d.]/g,'')"/>
+        <el-form-item label="锁具机构RFID" prop="locksetRfid" >
+          <el-input v-model="form.locksetRfid" placeholder="请输入锁具机构RFID(纯数字)" maxlength="128"  oninput="value=value.replace(/[^\d.]/g,'')"/>
         </el-form-item>
         <el-form-item label="物资名称" prop="materialsId">
           <el-select
@@ -211,8 +211,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="锁具型号" prop="locksetSpec">
-          <el-input v-model="form.locksetSpec" placeholder="请输入锁具型号" maxlength="16"/>
+        <el-form-item label="锁具机构型号" prop="locksetSpec">
+          <el-input v-model="form.locksetSpec" placeholder="请输入锁具机构型号" maxlength="16"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -288,16 +288,16 @@ export default {
       // 表单校验
       rules: {
         locksetCode: [
-          { required: true, message: "锁具编码不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构编码不能为空", trigger: "blur" },
         ],
         locksetName: [
-          { required: true, message: "锁具名称不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构名称不能为空", trigger: "blur" },
         ],
         locksetNfc: [
-          { required: true, message: "锁具NFC不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构NFC不能为空", trigger: "blur" },
         ],
         locksetRfid: [
-          { required: true, message: "锁具RFID不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构RFID不能为空", trigger: "blur" },
         ],
       },
       // 日期选择
@@ -378,14 +378,14 @@ export default {
         this.queryParams.startTime = this.formatDate(this.createTime[0]);
         this.queryParams.endTime = this.formatDate(this.createTime[1]);
       }
-      // 锁具数据
+      // 锁具机构数据
       listLockAPI(this.queryParams).then((response) => {
         this.repairList = response.data.records;
         this.total = response.data.total;
         this.loading = false;
       });
     },
-    // 获取锁具类型-所有
+    // 获取锁具机构类型-所有
     getLockTypeList() {
       const data = {
         current: 1,
@@ -402,6 +402,7 @@ export default {
       });
     },
     /** 转换部门数据结构 */
+
     normalizer(node) {
       if (node.children && !node.children.length) {
         delete node.children;
@@ -458,7 +459,7 @@ export default {
       this.reset();
       this.open = true;
       this.EditId = null;
-      this.title = "新增锁具信息";
+      this.title = "新增锁具机构信息";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -468,7 +469,7 @@ export default {
         // console.log(response, "编辑拿到单挑数");
         this.form = response.data;
         this.open = true;
-        this.title = "编辑锁具信息";
+        this.title = "编辑锁具机构信息";
       });
     },
     /** 提交按钮 */

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

@@ -221,7 +221,7 @@
           <el-input
             v-model="form.lockSpec"
             placeholder="请输入挂锁型号"
-           
+
           />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
@@ -386,7 +386,7 @@ export default {
     getList() {
       this.loading = true;
 
-      // 锁具数据
+      // 锁具机构数据
       listPadLockAPI(this.queryParams).then((response) => {
         this.repairList = response.data.records;
         this.total = response.data.total;

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

@@ -200,7 +200,7 @@ import { genCode } from "@/api/system/autocode/rule";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { listWorkarea } from "@/api/mes/wa/workarea";
-
+import { connectWebsocket, closeWebsocket, sendMsg } from "@/utils/websocket";
 export default {
   name: "Team",
   components: { Treeselect },
@@ -292,41 +292,37 @@ export default {
     this.getWorkareaList();
   },
   mounted() {
-    // setInterval(() => {
-    //   this.getList();
-    // }, 5000);
-    this.startRefreshing();
-    // 监听页面可见性变化
-    document.addEventListener("visibilitychange", this.handleVisibilityChange);
+    this.initWebSocket()
   },
-  beforeDestroy() {
-    // 清理定时器和事件监听器
-    this.stopRefreshing();
-    document.removeEventListener(
-      "visibilitychange",
-      this.handleVisibilityChange
-    );
+// 页面销毁就停止webStocket
+  destroyed() {
+    this.destory()
   },
   methods: {
-    startRefreshing() {
-      // 防止多次触发刷新
-      if (this.intervalId) return;
-      this.intervalId = setInterval(() => {
-        this.getList();
-      }, 5000);
+    initWebSocket(){
+      const userId=localStorage.getItem('userId')
+      connectWebsocket(`ws://192.168.1.127:9090/websocket/jobTicket/${userId}`,{w:'S',},(res)=>{
+          console.log(res,'websocket接收服务器的数据-index');
+          const resMsg=res
+          if(resMsg=='refresh'){
+            listJobPlayTicket(this.queryParams).then((response) => {
+              console.log(response, "response--作业票列表");
+              this.jobList = response.data.records;
+              this.total = response.data.total;
+              this.loading = false;
+            });
+          }
+        },
+        (err)=>{
+          console.log('断开重连',);
+        })
     },
-    stopRefreshing() {
-      if (this.intervalId) {
-        clearInterval(this.intervalId);
-        this.intervalId = null;
-      }
+    destory(){
+      closeWebsocket();//断开链接
     },
-    handleVisibilityChange() {
-      if (document.visibilityState === "visible") {
-        this.startRefreshing();
-      } else {
-        this.stopRefreshing();
-      }
+    // 发消息
+    sendMsg(){
+      sendMsg('aaa');
     },
 
     generateStatus(row) {

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

@@ -154,7 +154,7 @@
             </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>
@@ -164,7 +164,7 @@
 
 <script>
 import { getJobPlayTicketInfo } from '@/api/mes/jobplay/jobplay'
-// import { connectWebsocket, closeWebsocket, sendMsg } from "@/utils/websocket";
+import { connectWebsocket, closeWebsocket, sendMsg } from "@/utils/websocket";
 export default {
   name: 'jobPlayDetail',
   dicts: ['ticket_type', 'ticket_status'],
@@ -178,64 +178,15 @@ export default {
       intervalId: null
     }
   },
-
   mounted() {
     this.getJobPlayInfo()
-    this.startRefreshing()
-    // 监听页面可见性变化
-    document.addEventListener('visibilitychange', this.handleVisibilityChange)
+    this.initWebSocket()
   },
   // 页面销毁就停止webStocket
   destroyed() {
-    // this.destory()
-  },
-  beforeDestroy() {
-    // 清理定时器和事件监听器
-    this.stopRefreshing()
-    document.removeEventListener(
-      'visibilitychange',
-      this.handleVisibilityChange
-    )
+    this.destory()
   },
   methods: {
-    // initWebSocket(){
-    //   connectWebsocket('ws://192.168.1.127:9090/websocket/iot/127',{w:'S',},(res)=>{
-    //     console.log(res,'websocket接收服务器的数据');
-    //     if(res){
-    //
-    //     }
-    //   },
-    //     (err)=>{
-    //     console.log('断开重连',);
-    //     })
-    // },
-    // destory(){
-    //   closeWebsocket();//断开链接
-    // },
-    // // 发消息
-    // sendMsg(){
-    //   sendMsg('aaa');
-    // },
-    startRefreshing() {
-      // 防止多次触发刷新
-      if (this.intervalId) return
-      this.intervalId = setInterval(() => {
-        this.getJobPlayInfo()
-      }, 5000)
-    },
-    stopRefreshing() {
-      if (this.intervalId) {
-        clearInterval(this.intervalId)
-        this.intervalId = null
-      }
-    },
-    handleVisibilityChange() {
-      if (document.visibilityState === 'visible') {
-        this.startRefreshing()
-      } else {
-        this.stopRefreshing()
-      }
-    },
     getJobPlayInfo() {
       let ticketId
       if (this.$route.query.ticketId) {
@@ -254,7 +205,44 @@ export default {
         this.colockUserList = res.data.colockUserList
         this.ticketPointsList = res.data.ticketPointsList
       })
-    }
+    },
+    initWebSocket(){
+      const userId=localStorage.getItem('userId')
+      connectWebsocket(`ws://192.168.1.127:9090/websocket/jobTicket/${userId}`,{w:'S',},(res)=>{
+        console.log(res,'websocket接收服务器的数据');
+        const resMsg=res
+        if(resMsg=='refresh'){
+          let ticketId
+          if (this.$route.query.ticketId) {
+            ticketId = this.$route.query.ticketId
+          } else {
+            ticketId = localStorage.getItem('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
+          })
+        }
+      },
+        (err)=>{
+        console.log('断开重连',);
+        })
+    },
+    destory(){
+      closeWebsocket();//断开链接
+    },
+    // 发消息
+    sendMsg(){
+      sendMsg('aaa');
+    },
+
   }
 }
 </script>

src/views/mes/material/lockers/index.vue

@@ -346,9 +346,7 @@ export default {
     this.getHardWare()
     this.getTreeselect()
   },
-  mounted() {
-    this.materialsCabinets()
-  },
+
   methods: {
     getHardWare() {
       listHardware(this.queryhwParams).then((response) => {

src/views/mes/md/locksettype/index.vue

@@ -7,18 +7,18 @@
       :inline="true"
       v-show="showSearch"
     >
-      <el-form-item label="锁具类型编码" prop="locksetTypeCode">
+      <el-form-item label="锁具机构类型编码" prop="locksetTypeCode">
         <el-input
           v-model="queryParams.locksetTypeCode"
-          placeholder="请输入锁具类型编码"
+          placeholder="请输入锁具机构类型编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="锁具类型名称" prop="locksetTypeName">
+      <el-form-item label="锁具机构类型名称" prop="locksetTypeName">
         <el-input
           v-model="queryParams.locksetTypeName"
-          placeholder="请输入锁具类型名称"
+          placeholder="请输入锁具机构类型名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -83,16 +83,16 @@
     >
       <el-table-column
         prop="locksetTypeCode"
-        label="锁具类型编码"
+        label="锁具机构类型编码"
         width="260"
       ></el-table-column>
       <el-table-column
         prop="locksetTypeName"
-        label="锁具类型名称"
+        label="锁具机构类型名称"
         width="260"
       ></el-table-column>
       <el-table-column
-        label="锁具类型图标"
+        label="锁具机构类型图标"
         align="center"
         prop="locksetTypeIcon"
       >
@@ -107,7 +107,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="锁具类型图片"
+        label="锁具机构类型图片"
         align="center"
         prop="locksetTypeImg"
       >
@@ -123,12 +123,12 @@
       </el-table-column>
 <!--      <el-table-column-->
 <!--        prop="locksetTypeDescription"-->
-<!--        label="锁具类型描述"-->
+<!--        label="锁具机构类型描述"-->
 <!--        width="260"-->
 <!--      ></el-table-column>-->
       <el-table-column
         prop="locksetTypeSpec"
-        label="锁具类型规格"
+        label="锁具机构类型规格"
         width="260"
       ></el-table-column>
       <el-table-column
@@ -189,11 +189,11 @@
 
         <el-row>
           <el-col :span="19">
-            <el-form-item label="锁具类型编码" prop="locksetTypeCode">
+            <el-form-item label="锁具机构类型编码" prop="locksetTypeCode">
               <el-input
                 style="width: 318px"
                 v-model="form.locksetTypeCode"
-                placeholder="请输入锁具类型编码"
+                placeholder="请输入锁具机构类型编码"
               />
             </el-form-item>
           </el-col>
@@ -212,18 +212,18 @@
         </el-row>
         <el-row>
           <el-col :span="18">
-            <el-form-item label="锁具类型名称" prop="locksetTypeName">
+            <el-form-item label="锁具机构类型名称" prop="locksetTypeName">
               <el-input
                 style="width: 318px"
                 v-model="form.locksetTypeName"
-                placeholder="请输入锁具类型名称"
+                placeholder="请输入锁具机构类型名称"
               />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="锁具类型图标" prop="locksetTypeIcon">
+            <el-form-item label="锁具机构类型图标" prop="locksetTypeIcon">
               <ImageUploadSingle
                 :limit="1"
                 :value="form.locksetTypeIcon"
@@ -234,7 +234,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="锁具类型图片" prop="locksetTypeImg">
+            <el-form-item label="锁具机构类型图片" prop="locksetTypeImg">
               <ImageUploadSingle
                 :limit="1"
                 :value="form.locksetTypeImg"
@@ -247,20 +247,20 @@
         </el-row>
         <el-row>
           <el-col :span="10">
-            <el-form-item label="锁具类型描述" prop="locksetTypeSpec">
+            <el-form-item label="锁具机构类型描述" prop="locksetTypeSpec">
               <el-input
                 type="text"
                 style="width: 318px"
                 v-model="form.locksetTypeSpec"
-                placeholder="请输入锁具类型规格"
+                placeholder="请输入锁具机构类型规格"
               />
             </el-form-item>
-<!--            <el-form-item label="锁具类型描述" prop="locksetTypeDescription">-->
+<!--            <el-form-item label="锁具机构类型描述" prop="locksetTypeDescription">-->
 <!--              <el-input-->
 <!--                type="textarea"-->
 <!--                style="width: 318px"-->
 <!--                v-model="form.locksetTypeDescription"-->
-<!--                placeholder="请输入锁具类型描述"-->
+<!--                placeholder="请输入锁具机构类型描述"-->
 <!--              />-->
 <!--            </el-form-item>-->
           </el-col>
@@ -345,10 +345,10 @@ export default {
         // ],
 
         locksetTypeCode: [
-          { required: true, message: "锁具类型编号不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构类型编号不能为空", trigger: "blur" },
         ],
         locksetTypeName: [
-          { required: true, message: "锁具类型名称不能为空", trigger: "blur" },
+          { required: true, message: "锁具机构类型名称不能为空", trigger: "blur" },
         ],
       },
     };
@@ -429,7 +429,7 @@ export default {
         this.form.parentTypeId = 0;
       }
       this.open = true;
-      this.title = "添加锁具类型";
+      this.title = "添加锁具机构类型";
       listLockType().then((response) => {
         this.deptOptions = this.handleTree(
           response.data.records,
@@ -458,7 +458,7 @@ export default {
           this.form.parentTypeId=null
         }
         this.open = true;
-        this.title = "修改锁具类型";
+        this.title = "修改锁具机构类型";
       });
       listLockType().then((response) => {
         this.deptOptions = this.handleTree(

src/views/mes/md/locktype/index.vue

@@ -161,7 +161,7 @@
       </el-table-column>
     </el-table>
 
-    <!-- 添加或修改锁具类型对话框 -->
+    <!-- 添加或修改锁具机构类型对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row>

src/views/mes/md/segregationpoint/index.vue

@@ -239,7 +239,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="锁具类型图"
+        label="锁具机构类型图"
         align="center"
         prop="locksetTypeImg"
         width="90"
@@ -254,7 +254,7 @@
           <span v-else>-</span>
         </template>
       </el-table-column>
-      
+
       <el-table-column label="创建时间" align="center" prop="createTime">
       </el-table-column>
       <el-table-column
@@ -358,7 +358,7 @@
                 maxlength="16"
               />
             </el-form-item>
-           
+
 
           </el-col>
         </el-row>
@@ -373,7 +373,7 @@
                 placeholder="选择作业区域"
               />
             </el-form-item>
-            
+
 
           </el-col>
           <el-col :span="11">
@@ -386,7 +386,7 @@
                 placeholder="选择挂锁类型"
               />
             </el-form-item>
-          
+
           </el-col>
         </el-row>
         <el-row>
@@ -405,28 +405,28 @@
                 />
               </el-select>
             </el-form-item>
-           
+
           </el-col>
           <el-col :span="12">
-             <el-form-item label="锁具类型" prop="locksetTypeId">
+             <el-form-item label="锁具机构类型" prop="locksetTypeId">
               <treeselect
                 style="width: 300px"
                 v-model="form.locksetTypeId"
                 :options="LockTypeOptions"
                 :normalizer="normalizerLockset"
-                placeholder="选择锁具类型"
+                placeholder="选择锁具机构类型"
               />
             </el-form-item>
-           
+
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-           <el-form-item label="锁具名称" prop="lockTypeName">
+           <el-form-item label="锁具机构名称" prop="lockTypeName">
               <el-input
                 style="width: 300px"
                 v-model="form.lockTypeName"
-                placeholder="请输入锁具名称"
+                placeholder="请输入锁具机构名称"
               />
             </el-form-item>
           </el-col>
@@ -469,7 +469,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="锁具类型图" prop="locksetTypeImg">
+            <el-form-item label="锁具机构类型图" prop="locksetTypeImg">
               <ImageUploadSingle
                 :limit="1"
                 :value="form.locksetTypeImg"
@@ -594,7 +594,7 @@ export default {
       },
       // 表单参数
       form: {},
-      LockTypeOptions: [],//锁具类型下拉
+      LockTypeOptions: [],//锁具机构类型下拉
       padLockTypeOptions: [],//挂锁类型下拉
       // 表单校验
       rules: {
@@ -666,7 +666,7 @@ export default {
           'children'
         )
       })
-      // 锁具类型
+      // 锁具机构类型
       listLockType(data).then((response) => {
         this.LockTypeOptions = this.handleTree(response.data.records, 'locksetTypeId')
       })