运行监测搜索、个人中心

ys_vue/src/routes.js

@@ -1,6 +1,7 @@
 import Login from './views/Login.vue'
 import NotFound from './views/404.vue'
 import Home from './views/Home.vue'
+import message from './views/message.vue'
 
 import map from './views/map/map.vue'
 
@@ -37,7 +38,8 @@ let routes = [
         iconCls: 'iconfont icon-ditu',
         leaf: true,//只有一个节点
         children: [
-            { path: '/map', component: map, name: '地图概览' }
+            { path: '/map', component: map, name: '地图概览' },
+            { path: '/message', component: message, name: '消息中心', hidden: true }
         ]
     },
     // 运行监测

ys_vue/src/views/Home.vue

@@ -24,7 +24,7 @@
               </p>
               <p>{{item.article}}</p>
             </div>
-            <div class="popover-button">查看全部</div>
+              <router-link :to="'/message'" tag="div" class="popover-button">查看全部</router-link>
           </el-popover>
         </el-badge>
         <el-dropdown trigger="hover">

ys_vue/src/views/detection/detection.vue

@@ -12,10 +12,10 @@
           </el-form-item>
         </el-col>
         <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索"></el-input>
+          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索" style="width: 300px;" clearable></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary">查询</el-button>
+          <el-button type="primary" @click="getMoulds(filters.name)">查询</el-button>
         </el-form-item>
       </el-form>
     </el-col>
@@ -29,18 +29,19 @@
       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>
-      <el-table-column prop="project" label="所属项目" width="100" sortable></el-table-column>
-      <el-table-column prop="client" label="客户名称" width="100" sortable></el-table-column>
-      <el-table-column prop="operation" label="运行次数" width="100" sortable></el-table-column>
-      <el-table-column prop="averageCycle" label="每模平均周期" width="140" sortable></el-table-column>
-      <el-table-column prop="power" label="电量" width="80" sortable></el-table-column>
-      <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-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 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="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>
+      <el-table-column label="电量" width="80" sortable></el-table-column>
+      <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.number)">不需要</a>
+          <a style="color: #409EFF; cursor: pointer" @click="toMaintenance(scope.row.id)">不需要</a>
         </template>
       </el-table-column>
     </el-table>
@@ -65,86 +66,68 @@ import util from "../../common/js/util";
 export default {
   data() {
     return {
-      moulds: [
-        //临时数据
-        {
-          number: "001",
-          name: "啦啦啦模具",
-          project: "啦啦计划",
-          client: "啦啦客户",
-          operation: "12450",
-          averageCycle: "114514",
-          power: "70%",
-          currentState: "还行",
-          lifetime: "100",
-          maintainRequirement: false
-        },
-        {
-          number: "002",
-          name: "abc模具",
-          project: "123计划",
-          client: "牛逼的客户",
-          operation: "789",
-          averageCycle: "101112",
-          power: "60%",
-          currentState: "凑合",
-          lifetime: "120",
-          maintainRequirement: true
-        }
-      ],
+      moulds: [],
       filters: {
         name: "",
         value: "0"
       },
       listLoading: false,
       total: 0,
-      tableHeight: 0
+      tableHeight: 0,
+      page: 1,
+      size: 20
     };
   },
   methods: {
     //分页
     handleCurrentChange(val) {
       this.page = val;
-      // this.getMoulds();
+      this.getMoulds();
     },
     handleSizeChange(val) {
       this.size = val;
-      // this.getMoulds();
+      this.getMoulds();
     },
     toMaintenance(id) {
       this.$router.push("/detection/" + id);
     },
-    getMoulds() {
-      // this.listLoading = true;
-      // this.http.post(
-      //   this.port.project.userList,
-      //   {
-      //     keyName: this.filters.keyName,
-      //     currentPage: this.page,
-      //     pageSize: this.size,
-      //     companyId: this.filters.companyId == "" ? -1 : this.filters.companyId,
-      //     flag: this.filters.flag == "姓名" ? 0 : this.filters.flag
-      //   },
-      //   res => {
-      //     this.listLoading = false;
-      //     if (res.code == "ok") {
-      //       this.list = res.data.list;
-      //       this.total = res.data.total;
-      //     } else {
-      //       this.$message({
-      //         message: res.msg,
-      //         type: "error"
-      //       });
-      //     }
-      //   },
-      //   error => {
-      //     this.listLoading = false;
-      //     this.$message({
-      //       message: error,
-      //       type: "error"
-      //     });
-      //   }
-      // );
+    getMoulds(keyWord) {
+      this.listLoading = true;
+      if (keyWord == null) {
+        var type = 0;
+      } else {
+        var type = this.filters.value;
+      }
+      var params = {
+        pageNum: this.page,
+        pageSize: this.size,
+        projectId: -1,
+        searchType: type,
+        keyName: keyWord
+      };
+      this.http.post(
+        this.port.mold.molds,
+        params,
+        res => {
+          this.listLoading = false;
+          if (res.code == "ok") {
+            this.moulds = res.data.list;
+            this.total = res.data.total;
+          } else {
+            this.$message({
+              message: res.msg,
+              type: "error"
+            });
+          }
+        },
+        error => {
+          this.listLoading = false;
+          this.$message({
+            message: error,
+            type: "error"
+          });
+        }
+      );
     }
   },
   created() {
@@ -152,7 +135,7 @@ export default {
     this.tableHeight = height - 210;
   },
   mounted() {
-    // this.getMoulds();
+    this.getMoulds();
   }
 };
 </script>

ys_vue/src/views/message.vue

@@ -0,0 +1,74 @@
+<template>
+  <section>
+    <!--工具条-->
+    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+      <el-form :inline="true">
+        <el-col :span="2">
+          <el-form-item>全部消息</el-form-item>
+        </el-col>
+      </el-form>
+    </el-col>
+
+    <div class="message-div" v-for="item in messages">
+      <p>
+        <span class="message-type">【{{item.type}}】</span>
+        <span class="message-title">{{item.title}}</span>
+        <span class="message-time">{{item.time}}</span>
+      </p>
+      <p>{{item.article}}</p>
+    </div>
+  </section>
+</template>
+
+<script>
+import util from "../common/js/util";
+export default {
+  data() {
+    return {
+      messages: [
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "模具开发人员：王有财已上传完毕，待您审核",
+          type: "审批",
+          time: "2019-1-9"
+        },
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "您上传的文档未通过项目经理：张多金审批，请修改后重新上传",
+          type: "审批",
+          time: "2019-1-9"
+        },
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "该模具需要保养，请前往处理",
+          type: "保养",
+          time: "2019-1-9"
+        }
+      ]
+    };
+  },
+  methods: {},
+  created() {},
+  mounted() {}
+};
+</script>
+
+<style scoped>
+.message-div {
+  padding: 5px 0;
+}
+.message-div > p {
+  line-height: 25px;
+  margin: 0;
+}
+.message-type {
+  font-weight: 800;
+}
+.message-title {
+  font-weight: 800;
+}
+.message-time {
+  padding-left: 30px;
+  color: grey;
+}
+</style>