Browse Source

又改了一堆东西

Reiskuchen 5 years ago
parent
commit
2327474849
2 changed files with 36 additions and 17 deletions
  1. 0 6
      ys_vue/src/views/detection/detection.vue
  2. 36 11
      ys_vue/src/views/mold/moldDetail.vue

+ 0 - 6
ys_vue/src/views/detection/detection.vue

@@ -43,12 +43,6 @@
           <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.number)">不需要</a>
           <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.number)">不需要</a>
         </template>
         </template>
       </el-table-column>
       </el-table-column>
-      <el-table-column label="模具更新" width="100" sortable>
-        <el-button size="small">请求</el-button>
-      </el-table-column>
-      <el-table-column label="模具报废" width="100" sortable>
-        <el-button size="small">请求</el-button>
-      </el-table-column>
     </el-table>
     </el-table>
 
 
     <!--工具条-->
     <!--工具条-->

+ 36 - 11
ys_vue/src/views/mold/moldDetail.vue

@@ -6,20 +6,33 @@
         <el-form-item>
         <el-form-item>
           <el-button type="primary" @click="backToList">返回</el-button>
           <el-button type="primary" @click="backToList">返回</el-button>
         </el-form-item>
         </el-form-item>
+        <el-form-item style="float: right;">
+          当前状态:
+          <a style="color: #409EFF; cursor: pointer" @click="toDetection">运行</a>
+          <span class="tips">(点击查看运行状态)</span>
+        </el-form-item>
       </el-form>
       </el-form>
     </el-col>
     </el-col>
     <el-col :span="24" class="title">模具基本信息</el-col>
     <el-col :span="24" class="title">模具基本信息</el-col>
     <el-col :span="24" class="main">
     <el-col :span="24" class="main">
       <el-col :span="6" class="detail">
       <el-col :span="6" class="detail">
-        模具信息编号:
+        云模盒编号:
         <span class="info">{{mould.typeNumber}}</span>
         <span class="info">{{mould.typeNumber}}</span>
       </el-col>
       </el-col>
       <el-col :span="6" class="detail">
       <el-col :span="6" class="detail">
+        模具编号:
+        <span class="info">{{mould.typeNumber}}</span>
+      </el-col>
+      <el-col :span="12" class="detail">
         模具名称:
         模具名称:
         <span class="info">{{mould.name}}</span>
         <span class="info">{{mould.name}}</span>
       </el-col>
       </el-col>
       <el-col :span="6" class="detail">
       <el-col :span="6" class="detail">
-        模次寿命:
+        设备电量:
+        <span class="info">{{mould.lifetime}}</span>
+      </el-col>
+      <el-col :span="6" class="detail">
+        倒计时:
         <span class="info">{{mould.lifetime}}</span>
         <span class="info">{{mould.lifetime}}</span>
       </el-col>
       </el-col>
       <el-col :span="6" class="detail">
       <el-col :span="6" class="detail">
@@ -31,15 +44,19 @@
         <span class="info">{{mould.RFIDcode}}</span>
         <span class="info">{{mould.RFIDcode}}</span>
       </el-col>
       </el-col>
       <el-col :span="6" class="detail">
       <el-col :span="6" class="detail">
-        云模盒编号
+        穴数
         <span class="info">{{mould.mouldNumber}}</span>
         <span class="info">{{mould.mouldNumber}}</span>
       </el-col>
       </el-col>
+      <el-col :span="6" class="detail">
+        模次寿命:
+        <span class="info">{{mould.project}}</span>
+      </el-col>
       <el-col :span="12" class="detail">
       <el-col :span="12" class="detail">
         所属项目:
         所属项目:
-        <span class="info">{{mould.project}}</span>
+        <span class="info">{{mould.manufacturer}}</span>
       </el-col>
       </el-col>
       <el-col :span="12" class="detail">
       <el-col :span="12" class="detail">
-        生产厂家
+        制造方工厂
         <span class="info">{{mould.manufacturer}}</span>
         <span class="info">{{mould.manufacturer}}</span>
       </el-col>
       </el-col>
     </el-col>
     </el-col>
@@ -55,17 +72,18 @@
             style="width: 100%;"
             style="width: 100%;"
           >
           >
             <el-table-column type="index" width="40"></el-table-column>
             <el-table-column type="index" width="40"></el-table-column>
-            <el-table-column prop="name" label="名称" width="400" sortable></el-table-column>
-            <el-table-column prop="size" label="大小" width="200" sortable></el-table-column>
-            <el-table-column prop="uploader" label="上传者" width="200" sortable></el-table-column>
-            <el-table-column prop="uploadTime" label="上传时间" width="200" sortable></el-table-column>
-            <el-table-column label="状态" width="200" sortable>
+            <el-table-column prop="name" label="名称" sortable></el-table-column>
+            <el-table-column prop="size" label="大小" width="220" sortable></el-table-column>
+            <el-table-column prop="uploader" label="上传者" width="220" sortable></el-table-column>
+            <el-table-column prop="uploadTime" label="上传时间" width="220" sortable></el-table-column>
+            <el-table-column label="状态" width="220" sortable>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <span v-if="scope.row.state == 0">需要</span>
                 <span v-if="scope.row.state == 0">需要</span>
                 <span v-else>不需要</span>
                 <span v-else>不需要</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column label="操作" width="220" sortable>
+            <el-table-column label="操作" width="300" sortable>
+              <el-button size="small">审批</el-button>
               <el-button size="small">浏览</el-button>
               <el-button size="small">浏览</el-button>
               <el-button size="small">下载</el-button>
               <el-button size="small">下载</el-button>
               <el-button size="small" type="danger">删除</el-button>
               <el-button size="small" type="danger">删除</el-button>
@@ -143,6 +161,9 @@ export default {
     backToList() {
     backToList() {
       this.$router.push("/moldList");
       this.$router.push("/moldList");
     },
     },
+    toDetection(){
+      this.$router.push("/detection");
+    },
     handleClick(tab, event) {
     handleClick(tab, event) {
       console.log(tab, event);
       console.log(tab, event);
     }
     }
@@ -172,4 +193,8 @@ export default {
 .detail {
 .detail {
   margin-bottom: 20px;
   margin-bottom: 20px;
 }
 }
+.tips {
+  font-size: 10px;
+  color: grey;
+}
 </style>
 </style>