Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/src/port.js

@@ -52,6 +52,9 @@ export default {
 
         moldFileDelete: '/mouldfile/delFile', //项目文档的删除
         moldOperationList: '/mouldoperationdynamics/list', //项目文档的删除
+
+        moldMaintain: '/mouldmaintain/maintain', //维护
+        moldMaintainList: '/mouldmaintain/list' //获取列表
     },
     //基础管理
     base: {

ys_vue/src/views/detection/maintenance.vue

@@ -2,58 +2,58 @@
   <section>
     <!--工具条-->
     <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-        <el-form :inline="true">
-            <el-form-item>
-                <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;">
-                保养提醒：
-                <el-switch v-model="prompt" active-color="#ff4949" disabled></el-switch>
-            </el-form-item>
-        </el-form>
+      <el-form :inline="true">
+        <el-form-item>
+          <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;">
+          保养提醒：
+          <el-switch v-model="prompt" active-color="#ff4949" disabled></el-switch>
+        </el-form-item>
+      </el-form>
     </el-col>
 
     <!--列表-->
     <el-table
-        :data="moulds"
-        highlight-current-row
-        :height="tableHeight"
-        v-loading="listLoading"
-        style="width: 100%;"
+      :data="moulds"
+      highlight-current-row
+      :height="tableHeight"
+      v-loading="listLoading"
+      style="width: 100%;"
     >
-        <el-table-column type="index" width="60"></el-table-column>
-        <el-table-column prop="maintenancer" label="保养人" width="100" sortable></el-table-column>
-        <el-table-column prop="plan" label="保养方案" sortable></el-table-column>
-        <el-table-column prop="picture" label="保养照片" width="200" sortable></el-table-column>
-        <el-table-column prop="closeTime" label="关闭时间" width="200" sortable></el-table-column>
+      <el-table-column type="index" width="60"></el-table-column>
+      <el-table-column prop="maintenancer" label="保养人" width="100" sortable></el-table-column>
+      <el-table-column prop="plan" label="保养方案" sortable></el-table-column>
+      <el-table-column prop="picture" label="保养照片" width="200" sortable></el-table-column>
+      <el-table-column prop="closeTime" label="关闭时间" width="200" sortable></el-table-column>
     </el-table>
 
     <!--工具条-->
     <el-col :span="24" class="toolbar">
-        <el-pagination
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-            :page-sizes="[20 , 50 , 80 , 100 , 200]"
-            :page-size="20"
-            layout="total, sizes, prev, pager, next"
-            :total="total"
-            style="float:right;"
-        ></el-pagination>
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[20 , 50 , 80 , 100 , 200]"
+        :page-size="20"
+        layout="total, sizes, prev, pager, next"
+        :total="total"
+        style="float:right;"
+      ></el-pagination>
     </el-col>
 
     <!--新增界面-->
     <el-dialog
-        title="处理保养"
-        v-if="maintenanceFormVisible"
-        :visible.sync="maintenanceFormVisible"
-        :close-on-click-modal="false"
-        customClass="customWidth"
+      title="处理保养"
+      v-if="maintenanceFormVisible"
+      :visible.sync="maintenanceFormVisible"
+      :close-on-click-modal="false"
+      customClass="customWidth"
     >
       <el-form
         :model="maintenanceForm"
@@ -101,11 +101,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click.native="maintenanceFormVisible = false">取消</el-button>
-        <el-button
-          type="primary"
-          @click.native="console.log('handled')"
-          :loading="maintenanceLoading"
-        >立即处理</el-button>
+        <el-button type="primary" @click.native="maintain" :loading="maintenanceLoading">立即处理</el-button>
       </div>
     </el-dialog>
   </section>
@@ -192,6 +188,56 @@ export default {
     //显示新增界面
     showMaintenance: function() {
       this.maintenanceFormVisible = true;
+    },
+    //获取记录
+    getList() {
+      this.listLoading = true;
+      this.http.post(
+        this.port.mold.moldMaintainList,
+        {},
+        res => {
+          this.listLoading = false;
+          if (res.code == "ok") {
+            console.log(res);
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        },
+        error => {
+          this.listLoading = false;
+          this.$message({
+            message: error,
+            type: "error"
+          });
+        }
+      );
+    },
+    //模具保养
+    maintain() {
+      this.http.post(
+        this.port.mold.moldMaintain,
+        {},
+        res => {
+          if (res.code == "ok") {
+            console.log(res);
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        },
+        error => {
+          this.listLoading = false;
+          this.$message({
+            message: error,
+            type: "error"
+          });
+        }
+      );
     }
   },
   created() {
@@ -200,6 +246,7 @@ export default {
   },
   mounted() {
     var mouldId = this.$route.params.id; //传到当前页面的模具编号
+    // this.getList();
   }
 };
 </script>

ys_vue/src/views/mold/moldDetail.vue

@@ -466,6 +466,7 @@
                 moldDetail: {},
                 customCompany: [],
                 boxes: [],
+                //单独新增零件时所需的三个变量
                 newParts: {
                     number: "",
                     name: "",
@@ -484,7 +485,16 @@
                             message: "请选择云模盒编号",
                             trigger: ["blur", "change"]
                         }
-                    ]
+                    ],
+                    number: [
+                        { required: true, message: "请输入零件编号", trigger: "blur" }
+                    ],
+                    name: [
+                        { required: true, message: "请输入零件名称", trigger: "blur" }
+                    ],
+                    life: [
+                        { required: true, message: "请输入零件寿命次数", trigger: "blur" }
+                    ],
                 },
 
                 //权限
@@ -694,6 +704,7 @@
                 });
             },
 
+            //将list中对应的文件传入相应的document下
             setList(list, num) {
                 var array = [];
                 for(var i in list){