Parcourir la source

运行监测页 和 运行监测详情页的页面

Reiskuchen il y a 5 ans
Parent
commit
2e9f2eda06

+ 1 - 0
ys_vue/src/routes.js

@@ -92,6 +92,7 @@ let routes = [
         component: Home,
         name: '',
         iconCls: 'iconfont icon-jiance',
+        leaf: true,//只有一个节点
         children: [
             { path: '/detection', component: detection, name: '运行检测' },
             { path: '/detection/:id', component: maintenance, name: '运行检测详情' }

+ 29 - 18
ys_vue/src/views/detection/detection.vue

@@ -6,29 +6,28 @@
         <el-col :span="2">
           <el-form-item>
             <el-select v-model="filters.value" clearable placeholder="请选择">
-              <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              ></el-option>
+              <el-option label="编号" value="0"></el-option>
+              <el-option label="名称" value="1"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入账号或姓名进行搜索"></el-input>
+          <el-input v-model="filters.name" placeholder="请输入编号或名称进行搜索"></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="primary">查询</el-button>
         </el-form-item>
-        <el-form-item style="float:right;">
-          <el-button type="primary">添加模具</el-button>
-        </el-form-item>
       </el-form>
     </el-col>
 
     <!--列表-->
-    <el-table :data="moulds" highlight-current-row v-loading="listLoading" style="width: 100%;">
+    <el-table
+      :data="moulds"
+      :height="tableHeight"
+      highlight-current-row
+      v-loading="listLoading"
+      style="width: 100%;"
+    >
       <el-table-column type="index" width="60"></el-table-column>
       <el-table-column prop="number" label="模具编号" width="100" sortable></el-table-column>
       <el-table-column prop="name" label="模具类型名称" width="140" sortable></el-table-column>
@@ -40,7 +39,9 @@
       <el-table-column prop="currentState" label="当前状态" width="100" sortable></el-table-column>
       <el-table-column prop="lifetime" label="模具寿命" width="100" sortable></el-table-column>
       <el-table-column label="模具保养" width="100" sortable>
-        <el-button size="small" @click="toMaintenance(number)">不需要</el-button>
+        <template slot-scope="scope">
+          <el-button size="small" @click="toMaintenance(scope.row.number)">不需要</el-button>
+        </template>
       </el-table-column>
       <el-table-column label="模具更新" width="100" sortable>
         <el-button size="small">请求</el-button>
@@ -52,11 +53,12 @@
 
     <!--工具条-->
     <el-col :span="24" class="toolbar">
-      <!-- <el-button type="danger" :disabled="this.sels.length===0">批量删除</el-button> -->
       <el-pagination
-        layout="prev, pager, next"
+        @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>
@@ -69,7 +71,6 @@ import util from "../../common/js/util";
 export default {
   data() {
     return {
-      options: [{ value: "aaa", label: "123" }, { value: "bbb", label: "456" }],
       moulds: [
         //临时数据
         {
@@ -102,21 +103,31 @@ export default {
         value: ""
       },
       listLoading: false,
-      total: 0
+      total: 0,
+      tableHeight: 0
     };
   },
   methods: {
+    //  分页
     handleCurrentChange(val) {
       this.page = val;
       // this.getUsers();
     },
+    handleSizeChange(val) {
+      this.size = val;
+      // this.getUsers();
+    },
     selsChange: function(sels) {
       this.sels = sels;
     },
-    toMaintenance(number) {
-      this.$router.push("/detection/" + number);
+    toMaintenance(id) {
+      this.$router.push("/detection/" + id);
     }
   },
+  created() {
+    let height = window.innerHeight;
+    this.tableHeight = height - 210;
+  },
   mounted() {}
 };
 </script>

+ 138 - 12
ys_vue/src/views/detection/maintenance.vue

@@ -1,18 +1,34 @@
 <template>
   <section>
     <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px; margin-bottom: 10px;">
       <el-form :inline="true">
-        <el-form-item>当前保养状态:需要</el-form-item>
         <el-form-item>
-          <el-button type="primary">立即处理</el-button>
+          <el-button type="primary" @click="backToDetection">返回</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-item style="float:right;">保养提醒</el-form-item>
       </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" highlight-current-row v-loading="listLoading" style="width: 100%;">
+    <el-table
+      :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="保养方案" width="100" sortable></el-table-column>
@@ -22,21 +38,84 @@
       <el-table-column label="操作" width="220" sortable>
         <el-button size="small">浏览</el-button>
         <el-button size="small">下载</el-button>
-        <el-button size="small">删除</el-button>
+        <el-button type="danger" size="small">删除</el-button>
       </el-table-column>
     </el-table>
 
     <!--工具条-->
     <el-col :span="24" class="toolbar">
-      <!-- <el-button type="danger" :disabled="this.sels.length===0">批量删除</el-button> -->
       <el-pagination
-        layout="prev, pager, next"
+        @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"
+    >
+      <el-form
+        :model="maintenanceForm"
+        label-width="100px"
+        :rules="formRules"
+        ref="addForm"
+        :inline="true"
+        class="demo-form-inline"
+      >
+        <el-form-item label="保养类型" prop="type">
+          <el-select
+            v-model="maintenanceForm.type"
+            clearable
+            filterable
+            placeholder="动作"
+            style="width:202px"
+          >
+            <el-option
+              v-for="item in type"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="选择动作" prop="action">
+          <el-select
+            v-model="maintenanceForm.action"
+            clearable
+            filterable
+            placeholder="喷油"
+            style="width:202px"
+          >
+            <el-option
+              v-for="item in action"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="保养提醒">
+          <el-switch v-model="prompt" active-color="#ff4949"></el-switch>
+        </el-form-item>
+      </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>
+      </div>
+    </el-dialog>
   </section>
 </template>
 
@@ -46,6 +125,7 @@ export default {
   data() {
     return {
       options: [{ value: "aaa", label: "123" }, { value: "bbb", label: "456" }],
+      //临时数据
       moulds: [
         {
           maintenancer: "张有财",
@@ -62,27 +142,73 @@ export default {
           state: "未通过"
         }
       ],
+      //标题栏过滤器
       filters: {
         name: "",
         value: ""
       },
       listLoading: false,
-      total: 0
+      total: 0,
+      tableHeight: 0,
+      formRules: {},
+      //保养界面 种类
+      type: [
+        { label: "动作", value: 0 },
+        { label: "小动作", value: 1 },
+        { label: "大动作", value: 2 }
+      ],
+      //保养界面 动作
+      action: [
+        { label: "喷油", value: 0 },
+        { label: "喷水", value: 1 },
+        { label: "喷可乐", value: 2 }
+      ],
+      //是否需要保养 提示
+      requirement: true,
+      prompt: true,
+      //保养详情界面显示
+      maintenanceFormVisible: false,
+      maintenanceLoading: false,
+      //保养详情界面数据
+      maintenanceForm: {
+        username: "",
+        account: "",
+        mobile: "",
+        teamName: "",
+        companyId: "",
+        roleType: "",
+        flag: 0
+      }
     };
   },
   methods: {
+    //  分页
     handleCurrentChange(val) {
       this.page = val;
       // this.getUsers();
     },
+    handleSizeChange(val) {
+      this.size = val;
+      // this.getUsers();
+    },
     selsChange: function(sels) {
       this.sels = sels;
     },
-    toMaintenance() {
-      this.$router.push("/staff");
+    backToDetection() {
+      this.$router.push("/detection");
+    },
+    //显示新增界面
+    showMaintenance: function() {
+      this.maintenanceFormVisible = true;
     }
   },
-  mounted() {}
+  created() {
+    let height = window.innerHeight;
+    this.tableHeight = height - 260;
+  },
+  mounted() {
+    var mouldId = this.$route.params.id; //传到当前页面的模具编号
+  }
 };
 </script>