From 461f3bd2ce176cf626fb722a3306ff72528d0e04 Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Tue, 14 Sep 2021 16:52:27 +0800
Subject: [PATCH] jiaozhunjianding

---
 hb_client/src/router/index.js        | 12 ++++++++++++
 hb_client/src/views/em/detection.vue | 12 ++++++++++++
 hb_client/src/views/em/equipment.vue | 15 ++++++++++++++-
 hb_client/src/views/sam/customer.vue | 13 ++++++++-----
 hb_server/apps/em/models.py          |  2 +-
 5 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/hb_client/src/router/index.js b/hb_client/src/router/index.js
index 2299d8e..8a4caec 100644
--- a/hb_client/src/router/index.js
+++ b/hb_client/src/router/index.js
@@ -141,6 +141,18 @@ export const asyncRoutes = [
         name: 'detection ',
         component: () => import('@/views/em/detection'),
         meta: { title: '监视和测量设备', icon: 'example', perms: ['index_manage'] }
+      },
+      {
+        path: 'equipment',
+        name: 'equipment',
+        component: () => import('@/views/em/equipment'),
+        meta: { title: '校准检定记录', icon: 'example', perms: ['index_manage'] }
+      },
+      {
+        path: 'detection ',
+        name: 'detection ',
+        component: () => import('@/views/em/detection'),
+        meta: { title: '运维记录', icon: 'example', perms: ['index_manage'] }
       }
     ]
   },
diff --git a/hb_client/src/views/em/detection.vue b/hb_client/src/views/em/detection.vue
index 5b7f1d9..d4cb95b 100644
--- a/hb_client/src/views/em/detection.vue
+++ b/hb_client/src/views/em/detection.vue
@@ -70,6 +70,10 @@
          <el-table-column label="使用类别">
           <template slot-scope="scope">{{ usetype_[scope.row.way] }}</template>
         </el-table-column>
+         <el-table-column label="校/检状态">
+          <template slot-scope="scope">{{  state_[scope.row.statedm] }}</template>
+        </el-table-column>
+        state_
         <el-table-column label="保管人">
           <template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template>
         </el-table-column>
@@ -329,6 +333,14 @@ export default {
           value: 2,
           label: '公用'
         }],
+        state_:{
+          0:'合格',
+          1:'准用',
+          2:'限用',
+          3:'禁用',
+          4:'停用',
+          5:'封存',
+        },
       options: [{
           value: 0,
           label: '合格'
diff --git a/hb_client/src/views/em/equipment.vue b/hb_client/src/views/em/equipment.vue
index a7df237..18a95b5 100644
--- a/hb_client/src/views/em/equipment.vue
+++ b/hb_client/src/views/em/equipment.vue
@@ -64,7 +64,20 @@
           <template slot-scope="scope">{{ scope.row.count }}</template>
         </el-table-column>
           <el-table-column label="状态">
-          <template slot-scope="scope">{{ state_[scope.row.state] }}</template>
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.state===0" type="success">
+            {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===1" type="warning">
+            {{ state_[scope.row.state] }}
+            </el-tag>
+            <el-tag v-else-if="scope.row.state===2" >
+            {{ state_[scope.row.state] }}
+            </el-tag>
+             <el-tag v-else type="danger">
+            {{ state_[scope.row.state] }}
+            </el-tag>
+            </template>
         </el-table-column>
          <el-table-column label="技术指标">
           <template slot-scope="scope">{{ scope.row.parameter }}</template>
diff --git a/hb_client/src/views/sam/customer.vue b/hb_client/src/views/sam/customer.vue
index bb6bea7..66fa455 100644
--- a/hb_client/src/views/sam/customer.vue
+++ b/hb_client/src/views/sam/customer.vue
@@ -33,7 +33,7 @@
     <el-card style="margin-top: 10px">
       <el-table
         v-loading="listLoading"
-        :data="warehouseList.results"
+        :data="customerList.results"
         border
         fit
         stripe
@@ -82,8 +82,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="warehouseList.count > 0"
-        :total="warehouseList.count"
+        v-show="customerList.count > 0"
+        :total="customerList.count"
         :page.sync="listQuery.page"
         :limit.sync="listQuery.page_size"
         @pagination="getList"
@@ -141,7 +141,10 @@ export default {
      customerList: {
         count: 0,
       },
-      
+       listQuery: {
+        page: 1,
+        page_size: 20,
+      },
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",
@@ -162,7 +165,7 @@ export default {
       this.listLoading = true;
       getCustomerList(this.listQuery).then((response) => {
         if (response.data) {
-          this.warehouseList = response.data;
+          this.customerList = response.data;
         }
         this.listLoading = false;
       });
diff --git a/hb_server/apps/em/models.py b/hb_server/apps/em/models.py
index 0b1e5a6..961e429 100644
--- a/hb_server/apps/em/models.py
+++ b/hb_server/apps/em/models.py
@@ -74,4 +74,4 @@ class Equipment(CommonBModel):
 
     def __str__(self):
         return self.number + '-' + self.name
-    
\ No newline at end of file
+