首页 发现 帮助
注册 登录
oyq28
/
imcs_331_web
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

前端页面功能处理

oyq28 3 月之前
父节点
b0165ebe72
当前提交
e195c103ac
共有 4 个文件被更改，包括 43 次插入 和 31 次删除
分列视图 显示文件统计
  1. 2 12
      imcs-ui/public/index.html
  2. 2 0
      imcs-ui/src/lang/zh/cuttingTool.js
  3. 13 2
      imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue
  4. 26 17
      imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/machineCuttingTool/index.vue

+ 2 - 12
imcs-ui/public/index.html
查看文件 

@@ -9,19 +9,9 @@
 
       content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
 
     />
 
     <link rel="icon" href="<%= BASE_URL %>logo.ico" />
 
-    <title>中国航空发动机集团</title>
 
-    <script>
 
-      var _hmt = _hmt || [];
 
-      (function() {
 
-        var hm = document.createElement("script");
 
-        hm.src = "https://hm.baidu.com/hm.js?ae92ebc51ffb2f8d62e7164dceac0b71";
 
-        var s = document.getElementsByTagName("script")[0];
 
-        s.parentNode.insertBefore(hm, s);
 
-      })();
 
-    </script>
 
+    <title>中国航空发动机集团</title>    
   </head>
 
   <body>
 
-    <div id="app"></div>
 
-    <!-- built files will be auto injected -->
 
+    <div id="app"></div>    
   </body>
 
 </html>

+ 2 - 0
imcs-ui/src/lang/zh/cuttingTool.js
查看文件 

@@ -56,6 +56,8 @@ export default {
 
         machineCuttingToolType: '刀具类型',
 
         cuttingToolRadius: '刀具半径',
 
         cuttingToolLife: '刀具寿命',
 
+        tl:'锁定状态',
 
+        status: '锁定运行状态',
 
       },
 
       // 刀具基础数据
 
       customizeCuttingtool: {

+ 13 - 2
imcs-ui/src/views/zuihou/dispatchMgr/tools/Index.vue
查看文件 

@@ -271,7 +271,7 @@
 
 
 	<el-card class="box-card">
 
         <div slot="header" class="clearfix">刀具取放处理</div>
 
-		<el-form ref="form11" :model="form11" :rules="rules4" label-width="100px">
 
+		<el-form ref="form11" :model="form11" :rules="rules10" label-width="100px">
 
 			<el-row :gutter="12" >
 
 				<el-col :xs="2" :sm="4">
 
 					<el-form-item label="起始位:" prop="start">
 
@@ -317,7 +317,7 @@
 
 
 	<el-card class="box-card">
 
         <div slot="header" class="clearfix">添加动态消息</div>
 
-		<el-form ref="form12" :model="form12" :rules="rules10" label-width="80px">
 
+		<el-form ref="form12" :model="form12" :rules="rules9" label-width="80px">
 
 			<el-row :gutter="12" >
 
 				<el-col :xs="6" :sm="8">
 
 					<el-form-item label="节点ID:" prop="taskNodeId">
 
@@ -501,6 +501,17 @@
 
         		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 
         	],
 
 		  },
 
+		  rules10: {
 
+        	start: [
 
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 
+        	],
 
+			goal: [
 
+        		{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 
+        	],
 
+			goalType: [
 
+				{ required: true, message: this.$t("rules.require"), trigger: 'blur' }
 
+			]
 
+      	  },
 
 		}
 
 	  },
 
 	  // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作

+ 26 - 17
imcs-ui/src/views/zuihou/prepareProductMgr/cuttingToolMgr/components/machineCuttingTool/index.vue
查看文件 

@@ -68,7 +68,7 @@
 
       <!-- 刀具数量 -->
 
       <el-table-column align="center" prop="toolNum" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolNum")' :show-overflow-tooltip="true">
 
         <template slot-scope="{ row }">
 
-          <el-tag :type="success" @click="queryMachineCuttingTools(row)">
 
+          <el-tag type="success" @click="queryMachineCuttingTools(row)">
 
             {{row.toolNum}}
 
           </el-tag>
 
         </template>
 
@@ -128,8 +128,8 @@
 
       </el-table-column>
 
       <!-- 刀具名称 -->
 
       <el-table-column align="center" prop="cuttingToolName" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolName")' :show-overflow-tooltip="true"></el-table-column>
 
-      <!-- 刀具规格 -->
 
-      <el-table-column align="center" prop="specifications" :label='$t("cuttingTool.table.machineCuttingtool.specifications")' :show-overflow-tooltip="true"></el-table-column>
 
+      <!-- 刀具规格 
+      <el-table-column align="center" prop="specifications" :label='$t("cuttingTool.table.machineCuttingtool.specifications")' :show-overflow-tooltip="true"></el-table-column>  -->
 
       <!-- 刀具图片 -->
 
       <el-table-column align="center" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolPicture")' :show-overflow-tooltip="true">
 
         <template slot-scope="{ row }">
 
@@ -160,15 +160,33 @@
 
       <!-- 预警极限 -->
 
       <el-table-column align="center" prop="earlyWarnning" :label='$t("cuttingTool.table.machineCuttingtool.earlyWarnning")' :show-overflow-tooltip="true"></el-table-column>
 
       <!-- 刀具id -->
 
-      <el-table-column align="center" prop="cuttingToolId" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolId")' :show-overflow-tooltip="true"></el-table-column>
 
-      <!-- 姊妹刀号 -->
 
-      <el-table-column align="center" prop="sisterCuttingToolId" :label='$t("cuttingTool.table.machineCuttingtool.sisterCuttingToolId")' :show-overflow-tooltip="true"></el-table-column>
 
-      <!-- 刀沿号 -->
 
-      <el-table-column align="center" prop="knifeEdgeNumber" :label='$t("cuttingTool.table.machineCuttingtool.knifeEdgeNumber")' :show-overflow-tooltip="true"></el-table-column>
 
+      <el-table-column align="center" prop="cuttingToolId" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolId")' :show-overflow-tooltip="true"></el-table-column> 
+      <!-- 姊妹刀号 
+      <el-table-column align="center" prop="sisterCuttingToolId" :label='$t("cuttingTool.table.machineCuttingtool.sisterCuttingToolId")' :show-overflow-tooltip="true"></el-table-column> -->
 
+      <!-- 刀沿号 
+      <el-table-column align="center" prop="knifeEdgeNumber" :label='$t("cuttingTool.table.machineCuttingtool.knifeEdgeNumber")' :show-overflow-tooltip="true"></el-table-column> -->
 
       <!-- 刀具位置 -->
 
       <el-table-column align="center" prop="cuttingToolPosition" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolPosition")' :show-overflow-tooltip="true"></el-table-column>
 
       <!-- 刀具半径 -->
 
       <el-table-column align="center" prop="cuttingToolRadius" :label='$t("cuttingTool.table.machineCuttingtool.cuttingToolRadius")' :show-overflow-tooltip="true"></el-table-column>
 
+      <!-- 锁定状态 -->
 
+      <el-table-column align="center" prop="tl" :label='$t("cuttingTool.table.machineCuttingtool.tl")' :show-overflow-tooltip="true">
 
+        <template slot-scope="{ row }">
 
+            <el-tag :type="row.tl=='L'? 'success':'info' ">              
+                {{row.tl=='L'?"已锁定":"未锁定"}}
 
+            </el-tag>
 
+        </template>  
+      </el-table-column>
 
+      <!-- 锁定运行状态 -->
 
+      <el-table-column align="center" prop="status" :label='$t("cuttingTool.table.machineCuttingtool.status")' :show-overflow-tooltip="true">
 
+        <template slot-scope="{ row }">
 
+            <el-tag :type="row.status=='0'? 'info':'success' ">               
+                {{row.status=='0'?"未锁定":"已锁定"}}
 
+            </el-tag>
 
+        </template>  
+      </el-table-column>
 
+
 
+
 
     </el-table>
 
     <pagination
 
       v-show="machineCuttingToolstableData.total > 0"
 
@@ -280,15 +298,6 @@
 
             })
 
             return
 
         }
 
-        // console.log(this.selection.length)
 
-        // if (this.selection.length > 1) {
 
-        //     this.$message({
 
-        //         message: this.$t("tips.mustOne"),
 
-        //         type: "warning"
 
-        //     })
 
-        //     return
 
-        // }
 
-
 
         const ids = []
 
         this.selection.forEach(item => {
 
             ids.push(item.id)