运行监测详情样式

ys_vue/src/views/detection/detection.vue

@@ -30,10 +30,17 @@
     >
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="modelNo" label="模具编号" width="100" sortable></el-table-column>
-      <el-table-column prop="modelName" label="模具名称" width="200" sortable></el-table-column>
-      <el-table-column prop="equipmentNo" label="云模盒编号" width="200" sortable></el-table-column>
+      <el-table-column label="模具名称" width="200" sortable>
+        <template slot-scope="scope">
+          <a
+            style="color: #409EFF; cursor: pointer"
+            @click="toMaintenance(scope.row.id)"
+          >{{scope.row.modelName}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column prop="equipmentNo" label="云模盒编号" width="120" sortable></el-table-column>
       <el-table-column prop="projectName" label="所属项目" width="200" sortable></el-table-column>
-      <el-table-column prop="factoryName" label="制造工厂" width="140" sortable></el-table-column>
+      <el-table-column prop="factoryName" label="制造工厂" sortable></el-table-column>
       <el-table-column prop="area" label="位置" width="200" sortable></el-table-column>
       <el-table-column prop="runTimes" label="运行次数" width="100" sortable></el-table-column>
       <el-table-column prop="ocCycle" label="每模平均周期" width="140" sortable></el-table-column>
@@ -41,10 +48,8 @@
       <el-table-column prop="state" label="当前状态" width="100" sortable></el-table-column>
       <el-table-column label="模具保养" width="100">
         <template slot-scope="scope">
-          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">
-            <span v-if="scope.row.runTimes > scope.row.initialModulus">需要</span>
-            <span v-else>不需要</span>
-          </a>
+          <span v-if="scope.row.runTimes > scope.row.initialModulus">需要</span>
+          <span v-else>不需要</span>
         </template>
       </el-table-column>
     </el-table>
@@ -92,13 +97,7 @@ export default {
       this.getMoulds();
     },
     toMaintenance(id) {
-        this.$router.push({
-            path: '/detectionDetail',
-            query: {
-                id: row.id
-            }
-        });
-      //this.$router.push("/detection/" + id);
+      this.$router.push("/detection/" + id);
     },
     getMoulds(keyWord) {
       this.listLoading = true;

ys_vue/src/views/detection/maintenance.vue

@@ -1,10 +1,16 @@
 <template>
   <section>
     <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px; margin-bottom: 10px;">
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
       <el-form :inline="true">
         <el-form-item>
-          <el-button type="primary" @click="backToDetection">返回</el-button>
+          <el-button type="text" @click="backToDetection" icon="el-icon-back" class="back">返回</el-button>
+        </el-form-item>
+        <el-form-item class="divLine"></el-form-item>
+        <el-form-item>
+          当前保养状态：
+          <span style="color: #ff4949; margin-right: 16px;">需要</span>
+          <el-button size="small" type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
         </el-form-item>
         <el-form-item style="float:right;">
           保养提醒
@@ -13,14 +19,6 @@
       </el-form>
     </el-col>
 
-    <el-col :span="24" style="padding-bottom: 0px;">
-      <el-col :span="3" style="height: 40px; line-height: 40px;">
-        当前保养状态：
-        <span style="color: #ff4949">需要</span>
-      </el-col>
-      <el-button type="primary" v-if="requirement" @click="showMaintenance">立即处理</el-button>
-    </el-col>
-
     <!--列表-->
     <el-table
       :data="moulds"
@@ -195,7 +193,7 @@ export default {
       this.sels = sels;
     },
     backToDetection() {
-      this.$router.push("/detection");
+      this.$router.go(-1);
     },
     //显示新增界面
     showMaintenance: function() {
@@ -213,4 +211,21 @@ export default {
 </script>
 
 <style scoped>
+.toolbar .el-form-item {
+  font-size: 14px;
+  vertical-align: middle;
+}
+.back {
+  font-size: 16px;
+}
+.divLine {
+  width: 2px;
+  background: #c3c3c3;
+  height: 100%;
+}
+
+.projectTitle {
+  font-size: 18px;
+  color: #333;
+}
 </style>

ys_vue/src/views/mold/moldDetail.vue

@@ -17,6 +17,8 @@
         </el-form-item>
       </el-form>
     </el-col>
+
+    <!-- 主区域 -->
     <el-col :span="24" :style="allDetail">
       <el-col :span="24" class="title">
         模具基本信息
@@ -100,8 +102,12 @@
               <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
               <el-table-column label="状态" width="120" sortable>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 0">需要</span>
-                  <span v-else>不需要</span>
+                  <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                  <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                  <span v-else-if="scope.row.state == 0">待双方审核</span>
+                  <span v-else-if="scope.row.state == 1">待资产方审核</span>
+                  <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                  <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
               <el-table-column label="操作" width="200" sortable>
@@ -131,11 +137,15 @@
               <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
               <el-table-column label="状态" width="120" sortable>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 0">需要</span>
-                  <span v-else>不需要</span>
+                  <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                  <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                  <span v-else-if="scope.row.state == 0">待双方审核</span>
+                  <span v-else-if="scope.row.state == 1">待资产方审核</span>
+                  <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                  <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="300" sortable>
+              <el-table-column label="操作" width="200" sortable>
                 <template slot-scope="scope">
                   <el-button size="small" @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                   <a :href="scope.row.fileUrl" :download="scope.row.fileName">
@@ -162,11 +172,15 @@
               <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
               <el-table-column label="状态" width="120" sortable>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 0">需要</span>
-                  <span v-else>不需要</span>
+                  <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                  <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                  <span v-else-if="scope.row.state == 0">待双方审核</span>
+                  <span v-else-if="scope.row.state == 1">待资产方审核</span>
+                  <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                  <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="300" sortable>
+              <el-table-column label="操作" width="200" sortable>
                 <template slot-scope="scope">
                   <el-button size="small" @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                   <a :href="scope.row.fileUrl" :download="scope.row.fileName">
@@ -193,11 +207,15 @@
               <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
               <el-table-column label="状态" width="120" sortable>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 0">需要</span>
-                  <span v-else>不需要</span>
+                  <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                  <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                  <span v-else-if="scope.row.state == 0">待双方审核</span>
+                  <span v-else-if="scope.row.state == 1">待资产方审核</span>
+                  <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                  <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="300" sortable>
+              <el-table-column label="操作" width="200" sortable>
                 <template slot-scope="scope">
                   <el-button size="small" @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                   <a :href="scope.row.fileUrl" :download="scope.row.fileName">
@@ -232,7 +250,7 @@
                   <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="300" sortable>
+              <el-table-column label="操作" width="200" sortable>
                 <template slot-scope="scope">
                   <el-button size="small" @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                   <a :href="scope.row.fileUrl" :download="scope.row.fileName">
@@ -259,11 +277,15 @@
               <el-table-column prop="indate" label="上传时间" width="200" sortable></el-table-column>
               <el-table-column label="状态" width="120" sortable>
                 <template slot-scope="scope">
-                  <span v-if="scope.row.state == 0">需要</span>
-                  <span v-else>不需要</span>
+                  <span v-if="scope.row.state == -2">生产方审核不通过</span>
+                  <span v-else-if="scope.row.state == -1">资产方审核不通过</span>
+                  <span v-else-if="scope.row.state == 0">待双方审核</span>
+                  <span v-else-if="scope.row.state == 1">待资产方审核</span>
+                  <span v-else-if="scope.row.state == 2">待生产方审核</span>
+                  <span v-else-if="scope.row.state == 3">审核通过</span>
                 </template>
               </el-table-column>
-              <el-table-column label="操作" width="300" sortable>
+              <el-table-column label="操作" width="200" sortable>
                 <template slot-scope="scope">
                   <el-button size="small" @click="checkOpen(scope.row.id, scope.row.fileName)">审批</el-button>
                   <a :href="scope.row.fileUrl" :download="scope.row.fileName">